From 6a47dc26e4d25fdf0fa9e503afb693bd11bb2b60 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 9 Feb 2018 00:52:44 +0100
Subject: [PATCH] a11y: Remove gtk.h include from listbox headers

---
 gtk/a11y/gtklistboxaccessible.h        |  1 -
 gtk/a11y/gtklistboxaccessibleprivate.h |  2 ++
 gtk/a11y/gtklistboxrowaccessible.h     |  1 -
 gtk/gtklistbox.c                       | 21 ++++++++++++++-------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gtk/a11y/gtklistboxaccessible.h b/gtk/a11y/gtklistboxaccessible.h
index c0efbee6d3..090bcf143c 100644
--- a/gtk/a11y/gtklistboxaccessible.h
+++ b/gtk/a11y/gtklistboxaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtklistboxaccessibleprivate.h b/gtk/a11y/gtklistboxaccessibleprivate.h
index 61ecea339f..2ea0de7982 100644
--- a/gtk/a11y/gtklistboxaccessibleprivate.h
+++ b/gtk/a11y/gtklistboxaccessibleprivate.h
@@ -20,6 +20,8 @@
 
 #include <gtk/a11y/gtklistboxaccessible.h>
 
+#include <gtk/gtklistbox.h>
+
 G_BEGIN_DECLS
 
 void _gtk_list_box_accessible_update_cursor     (GtkListBox    *box,
diff --git a/gtk/a11y/gtklistboxrowaccessible.h b/gtk/a11y/gtklistboxrowaccessible.h
index 95c9030891..1177e32c01 100644
--- a/gtk/a11y/gtklistboxrowaccessible.h
+++ b/gtk/a11y/gtklistboxrowaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 5fdc06094a..50e050a6c6 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -17,24 +17,31 @@
 
 #include "config.h"
 
+#include "gtklistbox.h"
+
 #include "gtkactionhelperprivate.h"
 #include "gtkadjustmentprivate.h"
+#include "gtkbindings.h"
+#include "gtkbuildable.h"
+#include "gtkcontainerprivate.h"
 #include "gtkcssnodeprivate.h"
-#include "gtklistbox.h"
-#include "gtkwidget.h"
+#include "gtkdnd.h"
+#include "gtkgesturemultipress.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkscrollable.h"
+#include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkcontainerprivate.h"
+
+#include "a11y/gtklistboxaccessibleprivate.h"
+#include "a11y/gtklistboxrowaccessible.h"
 
 #include <float.h>
 #include <math.h>
 #include <string.h>
 
-#include "a11y/gtklistboxaccessibleprivate.h"
-#include "a11y/gtklistboxrowaccessible.h"
-
 /**
  * SECTION:gtklistbox
  * @Short_description: A list container
-- 
2.30.2